Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Axel and Luna #180

Merged
merged 5 commits into from
Sep 17, 2024
Merged

Axel and Luna #180

merged 5 commits into from
Sep 17, 2024

Conversation

neuPanda
Copy link
Contributor

@neuPanda neuPanda commented Sep 7, 2024

Added Axel's Ale, The Cute Captain, Jenn in Tonic, and Hallelujah

need somebody who can sprite to be able to help with this
no additional sprite needed for Hallelujah, this drink is intended to be very simple in its representation

🆑

  • add: Added 4 new drinks: Axel's Ale, The Cute Captain, Jenn in Tonic, Hallelujah

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Sep 7, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Axel and luna Axel and Luna Sep 7, 2024
@Memeji Memeji assigned Memeji and neuPanda and unassigned Memeji Sep 7, 2024
@Memeji
Copy link
Collaborator

Memeji commented Sep 9, 2024

Do you wanna keep this open until you have sprites done?

@neuPanda
Copy link
Contributor Author

neuPanda commented Sep 9, 2024

they have basic sprites in their glasses, but not the advanced texturing. i don't know how to go about that. for the finer details

@Memeji
Copy link
Collaborator

Memeji commented Sep 12, 2024

I'd prefer if everything was done when we merge it.
I'll look into this further on the weekend.

@neuPanda
Copy link
Contributor Author

I'd prefer if everything was done when we merge it. I'll look into this further on the weekend.

technically it is done, however somebody has offered to improve the sprites

@Fansana
Copy link
Owner

Fansana commented Sep 13, 2024

could you improve the change log? Like adding the names of the drinks?

@sleepyyapril
Copy link
Contributor

Just a general question, does Floof allow adding two entirely separate mechanics in one PR? 'Cause this has drinks and the kiss and lick interactions in the same one.

@Fansana
Copy link
Owner

Fansana commented Sep 13, 2024

Just a general question, does Floof allow adding two entirely separate mechanics in one PR? 'Cause this has drinks and the kiss and lick interactions in the same one.

That is actually a very good point. Please split this up into multiple PRs. The Interactions can stay in the same PR just the drinks should go into it's own PR. Makes reviewing easier too.

@Mnemotechnician
Copy link
Contributor

It seems like the PR was made on an incorrect branch. It contains commits from #179 and probably downstreams from it.

@neuPanda
Copy link
Contributor Author

It seems like the PR was made on an incorrect branch. It contains commits from #179 and probably downstream from it.

ah, i think i had based this on the wrong branch i thought i had selected to use the main branch but i must have forgotten to change it or it didn't change like i thought it had before i created the next one. i will re-base. thank you

@neuPanda
Copy link
Contributor Author

damit git stop being a pain in my ass

@neuPanda
Copy link
Contributor Author

could you improve the change log? Like adding the names of the drinks?

I could do that, i just figured it would be better to not clog the log

@Mnemotechnician
Copy link
Contributor

- add: Added 4 new drinks: <... names> would be more appropriate.

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make a better changelog.

@FoxxoTrystan FoxxoTrystan added the Priority: 3-Low Should be resolved at some point label Sep 14, 2024
@neuPanda
Copy link
Contributor Author

Please make a better changelog.

what would you like me to add?

@FoxxoTrystan
Copy link
Collaborator

Look at @Mnemotechnician reply.

Copy link
Contributor

@ShatteredSwords ShatteredSwords left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All recipes work after playtesting

@Memeji Memeji merged commit 907ae99 into Fansana:master Sep 17, 2024
16 checks passed
Floof-Station-Bot added a commit that referenced this pull request Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 3-Low Should be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants